Updates for web UI.
This will be the last checkin on the master branch for this work until it is done.
I am a little late to the branching decision, but I will be making more changes than I thougt I would.