Added ImageUri field
Fixed model and layout issues
Merge branch 'master' into feature/subscribe