Updated MainActivity