MainView improved