Get upload working
Fix status margin