GUI-1199
updates to match wireframes
merged upstream
dash-order aws fix