* Added generic method for menu buttons;
* Minor refactoring;