added missing gemfiles
updating views page with refactored html/css
merge conflict