UI and caching fixes