Moved device selection on modal dialog on start - not yet relly working