UI improvements

Use indicator added