Roll layout back, until resize bug is fixed