Updated Main Activity

Lot's of Stuff