some changes in base layout