Updated styles and markup
Fix merge conflict