Minor Improvements

This update has minor UI updates, code clean up, and improvements to get ready for the new year.