Fixes for layout
More changes to layout