define-page macro; added logout