Bundle gems and change user controller

Fix this!