Changed layout, success block changes