layout grammer : finally fixed