Added toggleImage Ctrl and clean up