FIX: scaffold layout and add locale