message handling improved & multiple buttons in forms