Work on the base layout