More changes to layout, especially scrub uploads, but cutting is broken again (request.form)