used custom view for time displaying
added error image for image preview
other fixes
Upstream stuff