Add margins to not logged in users

Change-Id: I3185f4eb162c91b3004e4a0aeaf356a9bfb0a77a
Merge "Add margins to not logged in users"