Removed hardcoded strings and started using strings.xml