Secondary toolbar implementation (12-7-2013)
Event listener refactoring and various cleanup