More buttons and todos +CSS mods