Fixed buttons
Cleaning up