Fixed some layout issues and update the .gitignore