updated controllers and views with remaining instance variables