[enh] Adds fielfs to first screen
[pjt] Refactored the main package