code clean up
Merge branch 'frontend'
Added a loading gif now for uploads