Remove ap
Make the image widget better