working on ui part