fixing most UI issues