Experimental 2-set layout

 - Quick hack to experiment with the possibility of using a true 2-set
   layout
Fixed id for custom SymbolKey
Code cleanup