R-MVC refactor: Hover handling added