Puts back Ralph's Arrangement options that were reverted on 97ca7b51d11370e3000ed1e4c2c46726872d015d
Adds enabling and disabling of selected arrangements in the same way that
collapsing works, and more space between blocks (#415)

Change-Id: I5905b710c7260d4badad87b6cc15a6f7f74e6a22
add and fix type checking to color blocks

Change-Id: Iefc84d913a86fc32c02c6b12229f5f9bb64e30d0