Toolbar width, legend styling, code cleanup