Updated main activity