Fixed the issue  #11 and removed changes of pull request #21

1) Issue #11 is fixed.  Commit - 12266f9 and 3ee775b
2) Also, merging pull request #21 disturbed the position of "login/register" page. Actually, #19 was not an issue.  Commit - a31164c