MainActivity refactored
Small updates