Fix layers graphic.
Fix bar button item ordering.