Small tweaks to layout