Added updates to base layout.