Various UI and code changes