core, improved buttons