3376 with inconsistencies on bookmark back buttons
Better link for logged out people snooping
3376 Rebase and fix indents