startupmode back to picker
Merge branch 'leif7' into beta