Fixes DOC-1220, add professional mode

Date to come from @dianahuang