Layout and link fixes