More controller cleanups, and make it work with GA tracking