fix multiple request issue
working on fancy UI