Add custom bindings, tooltip, solve bugs