Fixing problems with layout