Revert "Removed template override for JEvents"

This reverts commit d82d8b440461978a3c530bfd9791cc0e01092f4f.
Revert "Revert "Removed template override for JEvents""

This reverts commit 768967e0980c60f0a2ec55e420fbd84cc68a977e.
REmove guest button code