Improve views
Merge commit 'e459b8ae142329d293d26d1684dbe72b1ec458ba'