Various improvements

Standardized template naming
Drop all data option in API page