fx & tiny fixes in \Main templates