WIP
improved css/html. Still not good
Fix tests