Merged Krutika's UI changes