Add the fancy button and fix a couple bugs