Small updates to layout