fix 2013/08/13 bug and fix some UI issue