disentangled from non fragment activities
removed non fragment activities