Unfortunately I haven't solved that issue either and the UI could easily break on updates