Fixed errors in RNScreen, modified logic in RNFactory