Localized DB + UI Improvement