more on-device fixes
small gui fixes