Fix image padding and fix spacing