Modified the UI with more trigger and Actions