layout updated
Merge branch 'logout'