Adding views, fixing config