Pretty routes, add new resources via button.
resolving merge conflicts