Refactored construction of main form and initial screen resolution - WIP
Merge remote-tracking branch 'origin/master'