Added Hateoas bundle and removed extra form stuff