Changes to layout, fixed multipliers