UPD: small fixes for yupe/layout