updated ui + auto ordering