Added twitter images
Added more order, less mess