Made changes to UI
Git merge