Moved some loose links into bars; fixed some formatting.