More UI and logic fixes