Fixing the layout options