Refactored guest view to bring it in line with others
Up to date jar