More UI button cleanup