Merged activity xml's with activities

dat stuff happened