Some edits to layouts etc

Some edits to layouts.
updated gitignore