Beautify NavBar and TabBar.
Merge
add .gitattributes