Issue 88 - Refine device menu
Merge pull request #118 from alivedise/gaia-local/issue-88

Fix #88, Issue 88 - Refine device menu