Revert back to the MainActivity as the target
Fix and populate the main activity layout