fixing structure
ui flow working