Refactor layouts to utilize base for all pages