Replaced hardcode Strings with @string resources