Improve positioning of the toolbar and arrow.
Draw the arrow in code instead of using images.