Also made a few other minor improvements and did some cleanup.
Attach a file by drag & drop or click to upload
