Empty field bug fixed.
Code organisation improved.