Updated devices view in preparation of editing

Also removed some unused flat ui
Minor clean up