UI and bug fixes