Bugfixes in frontend