added some partials and adapted routing