More improvements to UI, some minor debugging