More changes on the base layout