Fix duplicate partials and cleanup views