Fixed the frontend