Source clean up and minor UI changes