Updated base layout