Vpge 317

VPGE-317 |||| Fixed Layout Issues