Merge End_Screen into dev

If you think this branch is stable feel free to accept the merge, everything looks good to me.