More UI changes

All UI controls have been added.