Added forgotten files
Fixed views. Small changes in controller