Added new styles and updated markup