Order UI available + fix bug