UI Fix and Merge fix