cleaning up issues
refactor css and indent html
merge conflicts