Localized Database + UI Improvement