Dealt with more issues from optimization. Added (non-functional) site links.