add a select button for the layout, and add a couple tweaks