Combine Event and MainActivity with minor changes