Screen templates and Main class updates