Many changes on the base layout