Fix options bug and extract string resources