Minor updates to layout