Various UI and bug fixes