Layout and nav updates