Various UI and functionality additions