admin flow & user flow alsom some cosmetic fixes