add viewlets
Corrected templates