refactor html code in templates; refactor models, views, gitignore update