start of UI merge

Signed-off-by: nigel <nigel.cook@hp.com>
ui re-merge starts

Signed-off-by: nigel <nigel.cook@hp.com>