some minor formatting fixes
more updates for logout compatability