VPGE-317 fixed layouts
Fixed minor things
Merge branch 'VPGE-317' into 7.x-1.x