Changed a few Views and Controller