Refactored logout view (closes #196)