fixed forgotten merge conflict and added more pictures for howto-screen