fix css
add some tests
remove not needed code