refine Messages and Button Actions