Ticket #905: Fixing layout