basic layour login/logout buttons
Merge branch 'calendar'