UI bug fixes
Merge branch 'sarah_finalsprint' into develop