Refactor styles

Before accepting, run at localhost and QA.

Comment below if you find something weird/wrong.