changed factors upload
resolved conflicts
added listview of factors
added show results
Cleaned up code
Changed up code format