added default views
merged in master