Fixing showing and hiding cursor and removing uneeded bundles