Fix bugs and add scroll to eliminate view