Add pictures, fix bug with control