Design updated and a bug fixed again.