LUN-1133 : Fix centering image and credit displayed next to image, code ...

...refactoring