[BUG #7273] Adjusted layouts to include padding