Removed unneeded menus
Moved add device into it's own activity