bug fixes on front end