css cleanup, fix fadeout, cleanup todos and fix tests