Change template to use css display property
Move method signature coercion stuff into the respective services