Leon changes - email button and other stuff