Improvement and images fixed