Add layout and links