Lil code cleaning and modal uploader added