Fix presentation and incorporate images
resolve merge