misc UI TODOs

Change-Id: Ic874bd8fac550d35268f006e1e1beb3bd88ba3b5