Updated main activity with menu