add fluidbox, image widget cleanup