Updated packages
Fixed after merge conflicts
Optimized dashboard, layout, translations and upload