Layout / Store fixes