Added setSignatureBitmap and some refactoring