Major UI and performance fix