Better upload modal and fix of small nag