Changes to layout to optimize speed