Merge: Improve tool ui