Cleanup on aisle 9
Add buttons