Cleanup and button changes

Cleanup and button changes