Two HTML viewers, cleanup, start of webapp code