Fixed up layout a bit, fixed broken links