Added views layouts, split into multiple partials