minor UI and bug fixes