more cleanup
move analysis view state stuff controller