populated organization & minor UI changes