Moved strings into string resource file