move helpers and partials
bugfixes