Fixes for UI issues