Refactoring and stylings - WIP
Styles update -WIP
Styles update -WIP