Move cluster selection below passwords, and minimized by default. Its an 'advance' option.
Merge branch 'test' into dev
dist