Refactoring and more CSS stuff