JS imports cleanup. Some html simplifications.