Update view for website and fix some bugs