wip newui

Change-Id: Ibd9f3428d6f120af21954d1baa722982ba9eb0c1