Update todo.  Fixing padding. Fixing new button name.  Formatting code.