updated base layouts