Finalizing the mockups