Minor fixes

Returned to this challenge after the initial time-box to complete the functionality, fix bugs, refactor the code for cleanliness, and improve the UI.

I'm planning on merging these commits once the original code is reviewed.