fixes bugs & change UI
fix bug