reorganized html
cleaned up merge conflict