UI and other updates