Fix upload not appearing in library
Lots of fixes
Remove spring
More fixes