Updated code for efficiency
UI : Created TriggerButton stub
Merge remote-tracking branch 'origin/ActivityLogger' into task/ui-triggerZones