Reorg style a bit, image setting