More tests and documentation
Rearranged Settings UI, UI code for clustering