Updated styles
Styles close to finalised