fixed merging problem
fixed the gui textfields sizes