modify layout & change icons