Few changes to Image Entity & CSS