Bug-116 Make MainActivity can select different category.

@john-hu Sine I type the wrong bug number of last PR. I rename it and send a PR again. And I have modified some where about last time you was mentioned. Please help me review it. Thank you.
It's fine. And this looks ok. I haven't tested it with the upgrade code and believe you already tested it.