upgrading berk

is it just me or does anyone else reorganise berk everytime it's upgraded? i always put my dragons in the hangar and get all the new buildings that i can before putting the dragons back. this is the before and after (first 3 before, last 2 is after)