Cleans up more of the membership controllers and snippets to be using the membership helper and fixes up a few issues