Added FPORTAL env keys for testing
Cleanup
More readable JSON for borders