added uids in more places, added name next to add mark button