include delete device, bug fixes, clear screens, and menu reorder