Small CSS fixes
TODO updated