Commiting UI changes
Merge Conflict resolved