OPAL-1447

Updated the layout