Restructured frontend