Finished some more work on the main view