Update layout + add Cascade Framework