Updated some CSS and some refactoring