fix UI; still states are very messy in UI