Minor changes to control layout.