models code refactor
views code fix
test code fix
fix gemfile