Small fixes in configuration
Small fixes to views