Added .idea file to gitignore
Added logout option on layout.html
Fixed layout conflict