fixes in frontend