Refactored a bit
Fixed Gemfile.lock
Fixed bug in home page