Update for layout and updating aliases/docs