Adding picture and re-arranging some stuff