Toolbar cleanup & added option to switch toolbar style.