Simplify Layouter
Split up monster Layouter.scala