Link and layout fixes