Merge Andrew's CSS and image changes.