Fixing broken links; some UI clean-up

I'm not done yet.