Updated cursor for auto generated button
-also cleaned up and moved some things around.