Fix urls

Still not right.
Major changes

New web