Some cleanup
Improve buttons