Minor changes for UI