fix about page view, finish users and merge