Touchups_1

general touchups
Merge branch 'front_end_touchups'