Reworking layout of textbox field - others to follow