Cleaned up layout of toolbar on main screen.

Started adding some outlets to control the layout.