Working on the token verification, refactoring the views