Completed dropbox main functions
Merged Surbhi's and Abhishek's code: Views and Controllers