fixed some mockups