Modefy .gitignore
Some small fixings
layout changings