Added auto-hide