Mainactivity fix
Revert "Mainactivity fix"

This reverts commit c57d4bf75a2451414d2330dbadd1b7a2bc300cac.
Revert "Revert "Mainactivity fix""

This reverts commit 915a7a4f6900909e5d349ffcd6559a1698cf616a.