Changed title structure everywhere