layout some changes