Merge pull request #70 from kazoompa/master

OPAL-1443
OPAL-1447 - updated the layout