Edit views and bugfixes