some fixes for ui