fix for ui issues