adding object control page to WM mockups
fixing conflict