Attempt to rewrite some NDGs to simpler (more good-looking) form

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@27606 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
More improvements in simplifying NDGs

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@27607 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e