Fix #88, Issue 88 - Refine device menu