Rearranged order, added missing div