some clean up + ui fix