Fixing merge conflicts Part 2
Fixed profile box layout
Fixed the layout issues post merge.