Further flushed out UX; added modal routes