Code clean up.

Fixed most of the merge issues.  Do test out and read through all the
code to see if it still works.  All the page should all be link or
navigable to each other.