New fixes for UI and functionality.