css/html update
merging issues
merging fix