Added seperation for logged in/logged out users