Add new layout and fix some git errors