Align the elements to a grid. Update comments.
Compensate the size changes with movements.
Fix odd jumps after editing the text to a shorter one.