fixes to device menu