Main Layout changes. Less lines of code.

- Update gitignore