APD-257: profile layout
APD-257: general refinements
Merge branch 'APD-257' into develop