new controllers and views
fixing views
final changes