Add default image and showing image switch
Refactoring