Reformatted most of code, unit testing web site navigation (not working
yet).