cleanup, tweaks, added csrf, added click counts
cleanup