ui somewhat working

Change-Id: I8ace177af07ed7db17e145a739e3c8b98406406a