improved device add form; cleaned up devices.json