reordered layer and location buttons correctly ;)