UI changes, code improvements