Cleaned up code for the in App Image handeling + added tap on image to close