Fix oAuth Callback Error and Cleanup Views