Merge pull request #15 from Andreis13/master

Merge into master.
Refactor the system under 2 windows.
Integrate field drawing and clicking possibilities.