updated Views and Controllers