Add control buttons, cleanup
Affordance update