Fixed layout breaking on logout/login