MainActivity changes (CP still not working)