Minor refactor and ordering of fixtures display