Beginning to add styles
Resolve merge conflicts