reworking controllers and views