Fixed issues with layout