layout cleanup, gitignore update