Log layout

* log layout
* some minor changes in git settings