Added guard config
More frontpage fixup