Made these easier to set by trimming them.
Cleaned up the file/cloud picker.