more refactoring of YC layout