Tidied layouts, added partials