yet more profile sync fixing. Plus added the Settings link back to the
top-right corner, above the Sign out link.