a lot of changes / improvements to textboxes / labels