comparing dev and mockups workflow and making fixes

comparing dev and mockups workflow and making fixes