additional styling and images
resolve merge conflicts