Bug fix & images