Fix after merge
Refactoring of MainActivity
Changed UI. It's final solution