merge codes from main & change some style of view