Few UI menu fixes