UI Adjustments from Oct 30

Fixed some bugs, improved UI.