Massive refactoring and continued styling of more components.