M7 - Refactoring in button's functionality of data base and category selection.
Merge pull request #4 from mss1982/master

M7 - Refactoring in button's functionality of data base and category sel...