Improved model layout
Merged with branch Acetrax