Minor fixes for UI