more changes to front end, need clean up