finishing up UI redux pt1