Moved logout button out of layout, it should only be on pages which are
firewalled.