Fix bugs of the view