Fix/variant ui