reorder the UI elements on createSession panel. Troy and Rob
merged conflict files