Updated UI Handling

Updated UI handling to use the UI api object
as the default handler.