View done - need to fix the Device Controller after merge