Fixed event handler
Fixed fish padding