More UI tweaks and internalised button panel adapter