288169d Refactor text-box layout