Refactor styles

Keep it on hold. In the meanwhile you can run at localhost and QA.

Comment below if you find something weird/wrong.