adding POP and a modal button
it works with custom messages now