Reordering stuff and commenting out the orientation events