Refactor sample a bit to make room for Priority and custom text