simplify index action and cleanup views