Minor CSS changes.
TODOs got shorter...