Several changes in views and style, some filter fixies