Updates to fix URL encode issues and make UI a little better