Cleanup some button transitions. Note some TODOs.