UC: rework layout

Change-Id: I039953017e77f49c556c3085785edebc46d89fe2