A few updates to layout