Fix issue with permanent token, Fix toolbar on details page