Fixed some broken bits in the controllers and the index page