Changed main activity
Fixed manifest conflict