Fixed "About Devices" and some code cleanup.