minor html changes
merge changes