Fix bugs and add more views