did some work on UI