partly fixed the frontend