1. UI improvement 2. Change refresh and show more logic