Restructured the frontend