minor UI changes and appropriate commenting