Feature/new main view

A lot of progress on stuff