Revert "Merge branch 'master'"

This reverts commit f435c585ff9ad234abf1b78709601f50bfedb8cd, reversing
changes made to 535e31748662017125db34777e05e4d4f4471d51.
Revert "Added programmatically generated imageview"

This reverts commit 535e31748662017125db34777e05e4d4f4471d51.