APY-13 : Complete the security gateway

Added alternate navigation (still needs testing)