[642] Minor UI tweaks suggested by DR.  Removed unnecessary nav and label changes on buttons