Fixed templates and button rendering