bug fixes in frontend