Improvements and mockups