fixed the error I pushed last time and connected all the activities