#21 CSE bug and layout fixes (2)