add review and chang some layout