fixes to front end