Cleaner UI and zoom integration