UI Improvements - Menu Plugin - Fixes #194