Refactor/ui styles