Fix/implement partials

Replaced repeating code with partial views (and fixed typo)