Added form hijacking

Also got rid of useless button registering.