massive button cleanup
admin updates