Fixed encoding, added missing layout