Emit on load toggle added, but doesn't do anything yet.
Also, markup cleanup.