updated base layout