second cut at ui updates