Better token handling + a bit better design on mobile