some fixes ui