Add picture and cleanup