Updated controllers and uploads files
Some small fixes