UI and backwards compatibility issues fixes