Modifications to layout