#2 Finish toolbar listener
Merge branch 'ToolbarListener'