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

...ection.