handle image buttons correctly
bug fixes