Fix deco grid in default layouts; Fix whitespaces