Improve views

close #2