comparing dev and mockups workflow and making fixes