Fix bugs in the view and user interface