Make changes for Inboxen/website#67 and Inboxen/queue#14