Some fix for ui