More bug fixes, UI changes