Localization and presentation fixes