Other fixes, ui changes