Various UI improvements as well as code changes