Fix rendering historic break point too early

The templates starts looking like spaghetti, but I'm not sure how to do it any other way.