UI updates initial commit (Raashid)