Add submit button
Proper use of template hierarchy