Main view fix