Fix some bugs on the page