Added extra menu on AppWidget.

Some refactorings are done as an side job.