final tweaking of views and db for version 1