Fix layout issue
Merge pull request #5484 from WebsiteDeveloper/Issue-5476

Issue #5476: Fix layout issue