Combined pending page, fix signin, add logout