Main functionality complete.
Stray if statement

If statement for the image grid not needed.
Merge branch 'dev'