Some important changes to layout