GPII-1015: Added display table to header container

Removed the hack from the previous commit and replaced by using display: table styling on the parent container.