Updated layout, updated gitignore