Reorganized and condensed second Activity into first