Strings moved to resources; Some changes in notifications