Refactored views a little
Finished refactoring