edited links, var names

added choose cafe page before this, updated links