Fixed some issues with frontend structure