change some views and fix bug