Added Base and MainView