[1.13.3.2] More layout fixes