Fixed styling and activity bug
Fixed merge conflicts