layout refactor, add gitingore