some changes on layout.