Integration with Jaivox tools, minor UI changes