Remove redundancy
Update todo
Reduce button size