changed most UI