Data management improvements (UI, data display up-to-date)