Modify UI for tables and notification