Rebuld interface and fix couple bugs