improved image preview loader
fix image preview padding
merge master branch