Updated compability issues with UI