Refactoring: Helper methods, CSS cleanup