Layout updates to remove links