Refactored views so that they are easier to read and control
Merged with origin