Fix order and update gemfile