Fix menu hover and cleanup