Bug fixes with snap back click binding