Add logout page
Fix layout
Improve coding style