Introduced an image element and refactored the code in the process so less code was required in the new element
Removed unused variables