Fixed popup binding. Added some zoom padding