Re-work the MainActivity