Fix destroy icon visibility
Refactor oauth callback and tokens