Fix most UI issues with introduced in 0caf941