Moved views to partials