[#80398362] completes cartmaker layouts improvements.
Merge pull request #61 from 18F/80398362_cartmaker_layout

[#80398362] completes cartmaker layouts improvements.