Small tweaks to overall layout