Added new styles. Refactored markup on for each view