Fix positioning and pictures