Fix button colorizing bug
Add new buttons