some refactorings
fix css