Second Commit

Device Naming, and Options Menu