Move Hover to separate class and menu

Change-Id: I77b177b97a7d005a4c39d25dd5d7b4ee47c73f5f