[Zhenghan] UI, small logic improvement and big fixes