Final proposal

Updated draft and screen templates