combined pages

added login, and logout