more front end updates
Merge branch 'front_end'