Refactored mix list into layout to allow swapping the header