Main Layout changes. Less lines of code.

- Update gitignore
uncomment
added missing imports
Merge pull request #1 from mipreamble/layout/review

Main Layout changes. Less lines of code.