CSS refactor 2
CSS refactor 2