Some css improvements
En passant, some code refactoring