Cleans up some of the layout links