(Temporary) Fix for images on front page.
Fixed circular import.
Added TODO.
Fixed (another) circular import.