updated wireframe html
complete merge