Fixed issue with UI