Command/navigation buttons drawing fixed.