testing fixes for UI issues