Updated mockups based on Rolan's feedback