new line and re-arranging links