New cargo layout#368

oli-obk merged 2 commits intooli-obk:mainoli-obk/ui_test:mainfrom

ranger-ross:new-cargo-layoutranger-ross/ui_test:new-cargo-layoutCopy head branch name to clipboard