model and controller and some feature tests all pass, reorganized view structure and flow