refactored main activity
Merge pull request #23 from knnyluk/refactor_mainactivity

refactored main activity