Enabled cursor visibility only on menu items

Cursor changes and refactoring