re-order the bottom row, and change VCS to Git