Revert 9a58a60..87167a5

This rolls back to commit 9a58a60be9c8362ba0ef2b08c7c38f1372ead038.
Revert 87167a5..5d23c31

This rolls back to commit 87167a5faa33f6f23425c530e034c8422ca7313e.
Commit for Hidde - MainImageFrame added