More cleanups

* Move control buttons to list