Refactoring and empty list notification.