Improved the toolbar in embedded mode in horizontal and vertical layout