update tahrir mockups with recent changes from Jenn