No longer piggy back existing template vars - improved redirection after re-auth.
Better styling for blocks
More granular template vars to enable improved styling