merged in ui updates