add partials
fix conflict
add guest views