Refactor styles

Before accepting, run at localhost and QA.