Fixing done buttons
Merge remote-tracking branch 'ddx/master'
Fixed image select bug