LPS-31355 Moves back the toolbar to a jsp to make more easier apply the hook (as it was in 6.2)