Updated the base layout