Initial Cleanup of Evan's Changes

Fixed some stuff on my side based on Evan's most recent changes. Added
x-button on load of the final results, and added loading animation.