Move ActionDemo to the correct directory.  Fix applied so that icons show up in the menu.  Various code changes suggested during code review.