Improve controls layout.