worked on ui issues