Added new styles, refactored views, started work on