Added stuff and finished main view