Fix image assets and minor code style