layout tighten up
merging files for squaring up pushing to git