fix conflicts
fixing up - need to clean up .html element on close
fixing up - only clean HTML when necessary