Changed string constants of Controller and Logic