ui changes, bug fixes