Fix little bugs
Make different views