started refacoring of client html
more work