bug fix #1 and some site ui improve