Pin image add
Cleaned up some scaling methods of annotation layer
Check the diff