Reorganize form, work on layout
Merge work on clustering / layout