Add more layout vaules
Move Tribal to types from supertypes
Use ADTs for subtypes