Fixing up the layout