Bundle gems and change user controller

Remove comment if need be