Database normalization and UI updates