Layout, localization and some minor updates.