Some css, some refactoring