Hi

whenever I make changes to the category layout I get a 504 error and need to log back in - any ideas?

Hello,

This indicates a server side issue, possibly a limit being reached.
You need to look at your error_log or ask your hosting provider for some insight on this issue since 504 is a rather generic error code.