bugfixes on front end