Fixed broken links; added missing links; UI clean-up