Refactor: uploads and re-arrange of previews with html5
Remove comments