Working UI
fix a bug