Made some UI changes
Merge fix