I messed up MainView thought I fixed it with last commit but it should
be good now