fixed a few flaws and login and logout works fine.
rsolved merge error
Merge pull request #6 from lrakhman/layout

Layout