more UI changes. silly bugs fixed.