Fix syntax, update images and some design