Updated Gemfile
Refactored models and views