Added bread crumb buttons and cleaned up some event handlers