Fix inconsistent ui issues on discussion during blackout period

FOR-108
Move these to the top section of imports; we are trying to move toward the style of built-in modules first, then third-party modules, then our modules