Made token work again, commit missing drawer_item things