asyncronous loading images
rename property
Merge branch 'feature/ui'