moved more html to includes
basic update working (not yet tested)