Fixing the layout