Final one page layout, update links