Main view fixes