SSP-767 Extend UI for Main Tool v2.0