fixing statically defined controls state, cleaning up template