todos reworked and css tweak