More styling and some styling refactorization