Fixing zoom issues and selection icon