rhhayne fixes button placement in toolbar
rhhayne seperates selected and user setting buttons in toolbar view
rhhayne merges toolbar fixes into dev