Modified Main view